dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7db0d93 5e2bf5a)

author	Glenn Morris <rgm@gnu.org>
	Sat, 19 Jan 2013 20:38:13 +0000 (12:38 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Sat, 19 Jan 2013 20:38:13 +0000 (12:38 -0800)
commit	de034a7986858d126f1fb481d37539024f4ac7a4
tree	15597fe5b724727da0d616ef05769d95b1c11c78	tree \| snapshot
parent	7db0d939826e6123ebd610eeb014603da5b9a20b	commit \| diff
parent	5e2bf5a24991f813c7591a8beb2bfd2b52d62082	commit \| diff

Merge from emacs-24; up to r111189

12 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
Makefile.in	diff1 \|	diff2 \|	blob \| history
doc/emacs/ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/emacs/trouble.texi	diff1 \|	diff2 \|	blob \| history
doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
etc/NEWS	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/dired.el	diff1 \|	diff2 \|	blob \| history
lisp/emacs-lisp/lisp-mode.el	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/etags.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/fns.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.